Aminet 4

home *** CD-ROM | disk | FTP | other *** search

/ Aminet 4 / Aminet 4 - November 1994.iso / aminet / dev / gcc / gcc260diffs.lha / gnu / src-patches / make-3.71.diffs < prev next >

Wrap

Text File | 1994-07-30 | 16.8 KB | 725 lines

diff -2rcN make-3.71/Makefile.in make-3.71-amiga/Makefile.in *** make-3.71/Makefile.in Sat May 21 20:48:45 1994 --- make-3.71-amiga/Makefile.in Thu Jul 28 23:14:54 1994 *************** *** 78,82 **** # Common prefix for machine-independent installed files. ! prefix = /usr/local # Common prefix for machine-dependent installed files. exec_prefix = $(prefix) --- 78,82 ---- # Common prefix for machine-independent installed files. ! prefix = /gnu # Common prefix for machine-dependent installed files. exec_prefix = $(prefix) diff -2rcN make-3.71/arscan.c make-3.71-amiga/arscan.c *** make-3.71/arscan.c Wed Feb 16 21:32:47 1994 --- make-3.71-amiga/arscan.c Thu Jul 28 23:14:55 1994 *************** *** 23,26 **** --- 23,29 ---- #include <sys/file.h> #endif + #ifdef amigados + #include <stdlib.h> + #endif #ifndef NO_ARCHIVES diff -2rcN make-3.71/configure make-3.71-amiga/configure *** make-3.71/configure Sat May 21 20:37:43 1994 --- make-3.71-amiga/configure Thu Jul 28 23:29:06 1994 *************** *** 215,219 **** *) ac_optarg=yes ;; esac ! eval "with_${ac_package}='$ac_optarg'" ;; -without-* | --without-*) --- 215,219 ---- *) ac_optarg=yes ;; esac ! "with_${ac_package}='$ac_optarg'" ;; -without-* | --without-*) *************** *** 299,303 **** # Try the directory containing this script, then `..'. ac_prog=$0 ! ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. srcdir=$ac_confdir --- 299,303 ---- # Try the directory containing this script, then `..'. ac_prog=$0 ! ac_confdir=`echo $ac_prog| sed 's|/$||' | sed 's|//|/|' | sed 's|/[^/]*$||'` test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. srcdir=$ac_confdir *************** *** 316,324 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='${CPP}' ! ac_compile='${CC-cc} $CFLAGS $LDFLAGS conftest.${ac_ext} -o conftest $LIBS >/dev/null 2>&1' # We want these before the checks, so the checks can modify their values. test -z "$CFLAGS" && CFLAGS=-g test -z "$LDFLAGS" && LDFLAGS=-g --- 316,326 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='${CPP}' ! ac_compile="${CC-gcc} $CFLAGS $LDFLAGS conftest.${ac_ext} -o conftest $LIBS" # We want these before the checks, so the checks can modify their values. + CFLAGS="-O2" #HACK (fnf) + LDFLAGS="" #HACK (fnf) test -z "$CFLAGS" && CFLAGS=-g test -z "$LDFLAGS" && LDFLAGS=-g *************** *** 357,361 **** #endif EOF ! ${CC-cc} -E conftest.c > conftest.out 2>&1 if egrep yes conftest.out >/dev/null 2>&1; then GCC=1 # For later tests. --- 359,363 ---- #endif EOF ! ${CC-gcc} -E conftest.c > conftest.out 2>&1 if egrep yes conftest.out >/dev/null 2>&1; then GCC=1 # For later tests. *************** *** 379,382 **** --- 381,385 ---- # Avoid using ./install, which might have been erroneously created # by make from ./install.sh. + INSTALL=/bin/ginstall #HACK (fnf) if test -z "${INSTALL}"; then test -n "$silent" || echo "checking for a BSD compatible install" *************** *** 445,453 **** test -n "$silent" || echo "checking how to run the C preprocessor" if test -z "$CPP"; then # This must be in double quotes, not single quotes, because CPP may get ! # substituted into the Makefile and ``${CC-cc}'' will simply confuse # make. It must be expanded now. ! CPP="${CC-cc} -E" cat > conftest.${ac_ext} <<EOF #include "confdefs.h" --- 448,457 ---- test -n "$silent" || echo "checking how to run the C preprocessor" + CPP="/gnu/lib/gcc-lib/mc68000-cbm-amigados/2.6.0/cpp" #HACK if test -z "$CPP"; then # This must be in double quotes, not single quotes, because CPP may get ! # substituted into the Makefile and ``${CC-gcc}'' will simply confuse # make. It must be expanded now. ! CPP="${CC-gcc} -E" cat > conftest.${ac_ext} <<EOF #include "confdefs.h" *************** *** 601,605 **** ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"` if test -z "$ac_err"; then ! rm -rf conftest* # SunOS 4.x string.h does not declare mem*, contrary to ANSI. echo '#include "confdefs.h" --- 605,609 ---- ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"` if test -z "$ac_err"; then ! rm -rf conftest* # SunOS 4.x string.h does not declare mem*, contrary to ANSI. echo '#include "confdefs.h" *************** *** 620,624 **** EOF ! eval $ac_compile if test -s conftest && (./conftest; exit) 2>/dev/null; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. --- 624,628 ---- EOF ! $ac_compile if test -s conftest && (./conftest; exit) 2>/dev/null; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. *************** *** 666,670 **** int t() { DIR *dirp = 0;; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* --- 670,674 ---- int t() { DIR *dirp = 0;; return 0; } EOF ! if $ac_compile; then rm -rf conftest* *************** *** 693,697 **** int t() { DIR *dirp = 0;; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* --- 697,701 ---- int t() { DIR *dirp = 0;; return 0; } EOF ! if $ac_compile; then rm -rf conftest* *************** *** 720,724 **** int t() { DIR *dirp = 0;; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* --- 724,728 ---- int t() { DIR *dirp = 0;; return 0; } EOF ! if $ac_compile; then rm -rf conftest* *************** *** 747,751 **** int t() { DIR *dirp = 0;; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* --- 751,755 ---- int t() { DIR *dirp = 0;; return 0; } EOF ! if $ac_compile; then rm -rf conftest* *************** *** 773,777 **** int closedir(); main() { exit(closedir(opendir(".")) != 0); } EOF ! eval $ac_compile if test -s conftest && (./conftest; exit) 2>/dev/null; then : --- 777,781 ---- int closedir(); main() { exit(closedir(opendir(".")) != 0); } EOF ! $ac_compile if test -s conftest && (./conftest; exit) 2>/dev/null; then : *************** *** 850,854 **** $ac_prog EOF ! eval $ac_compile if test -s conftest && (./conftest; exit) 2>/dev/null; then --- 854,858 ---- $ac_prog EOF ! $ac_compile if test -s conftest && (./conftest; exit) 2>/dev/null; then *************** *** 916,920 **** int t() { int i;; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* --- 920,924 ---- int t() { int i;; return 0; } EOF ! if $ac_compile; then rm -rf conftest* *************** *** 985,990 **** # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ! if ${CC-cc} -c conftest.c -o conftest.o >/dev/null 2>&1 \ ! && test -f conftest.o && ${CC-cc} -c conftest.c -o conftest.o >/dev/null 2>&1 then # Test first that cc exists at all. --- 989,994 ---- # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ! if ${CC-gcc} -c conftest.c -o conftest.o >/dev/null 2>&1 \ ! && test -f conftest.o && ${CC-gcc} -c conftest.c -o conftest.o >/dev/null 2>&1 then # Test first that cc exists at all. *************** *** 1071,1075 **** int t() { $ac_prog; return 0; } EOF ! if eval $ac_compile; then : else --- 1075,1079 ---- int t() { $ac_prog; return 0; } EOF ! if $ac_compile; then : else *************** *** 1160,1164 **** ; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* { --- 1164,1168 ---- ; return 0; } EOF ! if $ac_compile; then rm -rf conftest* { *************** *** 1187,1191 **** int t() { char *p = alloca(2 * sizeof(int));; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* --- 1191,1195 ---- int t() { char *p = alloca(2 * sizeof(int));; return 0; } EOF ! if $ac_compile; then rm -rf conftest* *************** *** 1226,1230 **** int t() { char *p = (char *) alloca(1);; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* --- 1230,1234 ---- int t() { char *p = (char *) alloca(1);; return 0; } EOF ! if $ac_compile; then rm -rf conftest* *************** *** 1274,1278 **** ; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* { --- 1278,1282 ---- ; return 0; } EOF ! if $ac_compile; then rm -rf conftest* { *************** *** 1307,1311 **** ; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* { --- 1311,1315 ---- ; return 0; } EOF ! if $ac_compile; then rm -rf conftest* { *************** *** 1340,1344 **** ; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* { --- 1344,1348 ---- ; return 0; } EOF ! if $ac_compile; then rm -rf conftest* { *************** *** 1397,1401 **** main(){exit(0);} EOF ! eval $ac_compile if test -s conftest && (./conftest; exit) 2>/dev/null; then : --- 1401,1405 ---- main(){exit(0);} EOF ! $ac_compile if test -s conftest && (./conftest; exit) 2>/dev/null; then : *************** *** 1439,1443 **** } EOF ! eval $ac_compile if test -s conftest && (./conftest; exit) 2>/dev/null; then --- 1443,1447 ---- } EOF ! $ac_compile if test -s conftest && (./conftest; exit) 2>/dev/null; then *************** *** 1584,1588 **** } EOF ! eval $ac_compile if test -s conftest && (./conftest; exit) 2>/dev/null; then : --- 1588,1592 ---- } EOF ! $ac_compile if test -s conftest && (./conftest; exit) 2>/dev/null; then : *************** *** 1617,1621 **** } EOF ! eval $ac_compile if test -s conftest && (./conftest; exit) 2>/dev/null; then --- 1621,1625 ---- } EOF ! $ac_compile if test -s conftest && (./conftest; exit) 2>/dev/null; then *************** *** 1651,1655 **** int t() { main();; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* ac_have_lib="1" --- 1655,1659 ---- int t() { main();; return 0; } EOF ! if $ac_compile; then rm -rf conftest* ac_have_lib="1" *************** *** 1675,1679 **** int t() { main();; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* ac_have_lib="1" --- 1679,1683 ---- int t() { main();; return 0; } EOF ! if $ac_compile; then rm -rf conftest* ac_have_lib="1" *************** *** 1704,1708 **** int t() { main();; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* ac_have_lib="1" --- 1708,1712 ---- int t() { main();; return 0; } EOF ! if $ac_compile; then rm -rf conftest* ac_have_lib="1" *************** *** 1739,1743 **** ; return 0; } EOF ! if eval $ac_compile; then : else --- 1743,1747 ---- ; return 0; } EOF ! if $ac_compile; then : else *************** *** 1787,1791 **** int t() { main();; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* ac_have_lib="1" --- 1791,1795 ---- int t() { main();; return 0; } EOF ! if $ac_compile; then rm -rf conftest* ac_have_lib="1" *************** *** 1828,1832 **** int t() { main();; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* ac_have_lib="1" --- 1832,1836 ---- int t() { main();; return 0; } EOF ! if $ac_compile; then rm -rf conftest* ac_have_lib="1" *************** *** 1858,1862 **** int t() { main();; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* ac_have_lib="1" --- 1862,1866 ---- int t() { main();; return 0; } EOF ! if $ac_compile; then rm -rf conftest* ac_have_lib="1" *************** *** 2006,2010 **** int t() { struct nlist n; n.n_un.n_name = 0;; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* --- 2010,2014 ---- int t() { struct nlist n; n.n_un.n_name = 0;; return 0; } EOF ! if $ac_compile; then rm -rf conftest* *************** *** 2095,2099 **** } EOF ! eval $ac_compile if test -s conftest && (./conftest; exit) 2>/dev/null; then --- 2099,2103 ---- } EOF ! $ac_compile if test -s conftest && (./conftest; exit) 2>/dev/null; then *************** *** 2162,2166 **** ; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* { --- 2166,2170 ---- ; return 0; } EOF ! if $ac_compile; then rm -rf conftest* { *************** *** 2199,2203 **** ; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* --- 2203,2207 ---- ; return 0; } EOF ! if $ac_compile; then rm -rf conftest* *************** *** 2229,2233 **** int t() { char *msg = *(sys_siglist + 1);; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* --- 2233,2237 ---- int t() { char *msg = *(sys_siglist + 1);; return 0; } EOF ! if $ac_compile; then rm -rf conftest* *************** *** 2260,2264 **** int t() { main();; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* ac_have_lib="1" --- 2264,2268 ---- int t() { main();; return 0; } EOF ! if $ac_compile; then rm -rf conftest* ac_have_lib="1" *************** *** 2308,2312 **** int t() { main();; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* ac_have_lib="1" --- 2312,2316 ---- int t() { main();; return 0; } EOF ! if $ac_compile; then rm -rf conftest* ac_have_lib="1" *************** *** 2458,2462 **** KMEM_GROUP='$KMEM_GROUP' REMOTE='$REMOTE' ! LIBS='$LIBS' srcdir='$srcdir' top_srcdir='$top_srcdir' --- 2462,2466 ---- KMEM_GROUP='$KMEM_GROUP' REMOTE='$REMOTE' ! LIBS='' #HACK (fnf) srcdir='$srcdir' top_srcdir='$top_srcdir' diff -2rcN make-3.71/dir.c make-3.71-amiga/dir.c *** make-3.71/dir.c Wed Jun 2 20:56:37 1993 --- make-3.71-amiga/dir.c Thu Jul 28 23:15:10 1994 *************** *** 493,497 **** --- 493,501 ---- /* Hooks for globbing. */ + #ifndef amigados #include <glob.h> + #else + #include "glob.h" + #endif /* Structure describing state of iterating through a directory hash table. */ diff -2rcN make-3.71/function.c make-3.71-amiga/function.c *** make-3.71/function.c Fri Mar 4 05:36:26 1994 --- make-3.71-amiga/function.c Thu Jul 28 23:15:11 1994 *************** *** 22,25 **** --- 22,28 ---- #include "commands.h" #include "job.h" + #ifdef amigados + #include <stdlib.h> + #endif static char *string_glob (); diff -2rcN make-3.71/getloadavg.c make-3.71-amiga/getloadavg.c *** make-3.71/getloadavg.c Tue May 10 02:10:29 1994 --- make-3.71-amiga/getloadavg.c Thu Jul 28 23:15:12 1994 *************** *** 473,476 **** --- 473,480 ---- int elem = 0; /* Return value. */ + #ifdef __amigados + #define NO_GET_LOAD_AVG + #endif + #ifdef NO_GET_LOAD_AVG #define LDAV_DONE diff -2rcN make-3.71/getopt.c make-3.71-amiga/getopt.c *** make-3.71/getopt.c Tue May 10 02:11:02 1994 --- make-3.71-amiga/getopt.c Thu Jul 28 23:15:15 1994 *************** *** 47,50 **** --- 47,53 ---- #include <stdio.h> + #ifdef amigados + #include <string.h> + #endif /* Comment out all this code if we are using the GNU C Library, and are not diff -2rcN make-3.71/glob/fnmatch.h make-3.71-amiga/glob/fnmatch.h *** make-3.71/glob/fnmatch.h Tue Dec 14 20:02:10 1993 --- make-3.71-amiga/glob/fnmatch.h Thu Jul 28 23:15:16 1994 *************** *** 43,47 **** --- 43,49 ---- /* Bits set in the FLAGS argument to `fnmatch'. */ + #ifndef FNM_PATHNAME #define FNM_PATHNAME (1 << 0) /* No wildcard can ever match `/'. */ + #endif #define FNM_NOESCAPE (1 << 1) /* Backslashes don't quote special chars. */ #define FNM_PERIOD (1 << 2) /* Leading `.' is matched only explicitly. */ diff -2rcN make-3.71/main.c make-3.71-amiga/main.c *** make-3.71/main.c Thu Apr 21 02:08:24 1994 --- make-3.71-amiga/main.c Thu Jul 28 23:15:17 1994 *************** *** 24,27 **** --- 24,30 ---- #include "job.h" #include "getopt.h" + #ifdef amigados + #include <stdlib.h> + #endif diff -2rcN make-3.71/read.c make-3.71-amiga/read.c *** make-3.71/read.c Mon May 2 22:35:24 1994 --- make-3.71-amiga/read.c Thu Jul 28 23:15:19 1994 *************** *** 82,89 **** --- 82,95 ---- static char *default_include_directories[] = { + #ifndef amigados INCLUDEDIR, "/usr/gnu/include", "/usr/local/include", "/usr/include", + #else + "/gnu/include", + "/gnu/g++-include", + "/gnu/os-include", + #endif 0 }; diff -2rcN make-3.71/remake.c make-3.71-amiga/remake.c *** make-3.71/remake.c Fri Apr 22 21:53:53 1994 --- make-3.71-amiga/remake.c Thu Jul 28 23:15:20 1994 *************** *** 990,995 **** --- 990,1000 ---- static char *dirs[] = { + #ifndef amigados "/lib", "/usr/lib", + #else + "/gnu/lib", + "/gnu/lib/libb", + #endif LIBDIR, /* Defined by configuration. */ 0 *************** *** 1000,1004 **** --- 1005,1013 ---- /* Buffer to construct possible names in. */ + #ifndef amigados char *buf = xmalloc (sizeof (LIBDIR) + 8 + strlen (libname) + 4 + 2 + 1); + #else + char *buf = xmalloc (8 + strlen (libname) + 9 + 2 + 1); + #endif char *file, **dp;